Remove gtk_fixed_get_has_window() and gtk_fixed_set_has_window()

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 464a97df06c77a94fa50b67d2433e90b4a10f059..468a5687ba9955cbf4a72af686f8887b8fd126c9 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -1501,8 +1501,6 @@ GtkFixed
 gtk_fixed_new
 gtk_fixed_put
 gtk_fixed_move
-gtk_fixed_get_has_window
-gtk_fixed_set_has_window
 <SUBSECTION Standard>
 GTK_FIXED
 GTK_IS_FIXED

diff --git a/docs/reference/gtk/tmpl/gtkfixed.sgml b/docs/reference/gtk/tmpl/gtkfixed.sgml
index add592d9d10704015743ffe08fa793338fa203bb..db64dcbbc1e23cfaef522c74dc8a93fa01719844 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkfixed.sgml
+++ b/docs/reference/gtk/tmpl/gtkfixed.sgml
@@ -125,23 +125,3 @@ Moves a child of a #GtkFixed container to the given position.
 @widget: the child widget.
 @x: the horizontal position to move the widget to.
 @y: the vertical position to move the widget to.
-
-
-<!-- ##### FUNCTION gtk_fixed_get_has_window ##### -->
-<para>
-
-</para>
-
-@fixed: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_fixed_set_has_window ##### -->
-<para>
-
-</para>
-
-@fixed: 
-@has_window: 
-
-

diff --git a/docs/tutorial/gtk-tut.sgml b/docs/tutorial/gtk-tut.sgml
index 1dba303bb1d808da567c7bcbdb75a43f595db27d..ce927ec044c4f34af39c3c4f57bcc9607d330b50 100755 (executable)
--- a/docs/tutorial/gtk-tut.sgml
+++ b/docs/tutorial/gtk-tut.sgml
@@ -6471,15 +6471,15 @@ the position specified by <literal>x</literal> and <literal>y</literal>.</para>
 position.</para>
 
 <programlisting role="C">
-void gtk_fixed_set_has_window( GtkFixed  *fixed,
-                               gboolean   has_window );
+void gtk_widget_set_has_window( GtkWidget  *widget,
+                                gboolean    has_window );
 
-gboolean gtk_fixed_get_has_window( GtkFixed *fixed );
+gboolean gtk_widget_get_has_window( GtkWidget *widget );
 </programlisting>
 
 <para>Normally, Fixed widgets don't have their own X window. Since this is
 different from the behaviour of Fixed widgets in earlier releases of GTK, 
-the function gtk_fixed_set_has_window() allows the creation of Fixed widgets 
+the function gtk_widget_set_has_window() allows the creation of Fixed widgets
 <emphasis>with</emphasis> their own window. It has to be called before
 realizing the widget.</para>
 

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 1422bacb65d954099e05922a1bdb924115e48979..6157aa14d77e9a67dd8d3c6fe73df7c2055ca878 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1383,10 +1383,6 @@ gtk_fixed_get_type G_GNUC_CONST
 gtk_fixed_move
 gtk_fixed_new
 gtk_fixed_put
-#ifndef GTK_DISABLE_DEPRECATED
-gtk_fixed_set_has_window
-gtk_fixed_get_has_window
-#endif
 #endif
 #endif
 

diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c
index 3106e1f000c7d63502aa32c360cad857b89ac8fd..9a0d67f0ee49d586b37a5def52619cfeb4c1c7dd 100644 (file)
--- a/gtk/gtkfixed.c
+++ b/gtk/gtkfixed.c
@@ -453,53 +453,5 @@ gtk_fixed_forall (GtkContainer *container,
     }
 }
 
-/**
- * gtk_fixed_set_has_window:
- * @fixed: a #GtkFixed
- * @has_window: %TRUE if a separate window should be created
- * 
- * Sets whether a #GtkFixed widget is created with a separate
- * #GdkWindow for @widget->window or not. (By default, it will be
- * created with no separate #GdkWindow). This function must be called
- * while the #GtkFixed is not realized, for instance, immediately after the
- * window is created.
- * 
- * This function was added to provide an easy migration path for
- * older applications which may expect #GtkFixed to have a separate window.
- *
- * Deprecated: 2.20: Use gtk_widget_set_has_window() instead.
- **/
-void
-gtk_fixed_set_has_window (GtkFixed *fixed,
-                         gboolean  has_window)
-{
-  g_return_if_fail (GTK_IS_FIXED (fixed));
-  g_return_if_fail (!gtk_widget_get_realized (GTK_WIDGET (fixed)));
-
-  if (has_window != gtk_widget_get_has_window (GTK_WIDGET (fixed)))
-    {
-      gtk_widget_set_has_window (GTK_WIDGET (fixed), has_window);
-    }
-}
-
-/**
- * gtk_fixed_get_has_window:
- * @fixed: a #GtkWidget
- * 
- * Gets whether the #GtkFixed has its own #GdkWindow.
- * See gtk_fixed_set_has_window().
- * 
- * Return value: %TRUE if @fixed has its own window.
- *
- * Deprecated: 2.20: Use gtk_widget_get_has_window() instead.
- **/
-gboolean
-gtk_fixed_get_has_window (GtkFixed *fixed)
-{
-  g_return_val_if_fail (GTK_IS_FIXED (fixed), FALSE);
-
-  return gtk_widget_get_has_window (GTK_WIDGET (fixed));
-}
-
 #define __GTK_FIXED_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index b69fb3339521e24ffe11b1f9bcc0a57a2847325e..7f2fa96003f132b2f1c992f03be5d699a05bc4bc 100644 (file)
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@@ -79,11 +79,7 @@ void       gtk_fixed_move              (GtkFixed       *fixed,
                                         GtkWidget      *widget,
                                         gint            x,
                                         gint            y);
-#ifndef GTK_DISABLE_DEPRECATED
-void       gtk_fixed_set_has_window    (GtkFixed       *fixed,
-                                       gboolean        has_window);
-gboolean   gtk_fixed_get_has_window    (GtkFixed       *fixed);
-#endif
+
 
 G_END_DECLS